From: Andrew Cooper Date: Fri, 12 Feb 2016 19:21:31 +0000 (+0000) Subject: tools/libxc: Fix use of zlib-options when building the domain builder X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1758 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=99ba14f3cff29eeb59809f92a6ca3a8705133c75;p=xen.git tools/libxc: Fix use of zlib-options when building the domain builder c/s de0f8c7c changed the use of zlib-options, and moved it from being locally generated to coming from ./configure. However, it neglected to modify the users of zlib-options. The curious use of $(call ...) was to select either the -D or -l options as appropriate, but c/s de0f8c7c broke this by loosing the `grep`. Instead, use $(filter ...) to pick out either the -D or -l options. This fixes the build with Clang, which complains at passing '-llzma' when trying to compile xc_dom_bzimageloader.c to xc_dom_bzimageloader.o. Signed-off-by: Andrew Cooper Acked-by: Wei Liu Acked-by: Roger Pau Monné --- diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 0a8614c952..608404feb9 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -226,10 +226,10 @@ else zlib-options = $(ZLIB) endif -xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D) -xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D) +xc_dom_bzimageloader.o: CFLAGS += $(filter -D%,$(zlib-options)) +xc_dom_bzimageloader.opic: CFLAGS += $(filter -D%,$(zlib-options)) -libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(call zlib-options,l) +libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(filter -l%,$(zlib-options)) libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)